Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Feb 2012 16:46:45 +0000 (08:46 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Feb 2012 16:46:45 +0000 (08:46 -0800)

Trivial merge